ci: Show OS release for our containers

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9bb30b979d2d2e0e56b8838bc1cbf43d74eb9523..6b863c5507114fb3a13139d94f12fe01f053526f 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -77,6 +77,7 @@ fedora-x86_64:
   variables:
     EXTRA_MESON_FLAGS: "--buildtype=debug --default-library=both"
   script:
+    - .gitlab-ci/show-info-linux.sh
     - meson subprojects update
     - meson ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS} ${BACKEND_FLAGS} ${FEATURE_FLAGS}
             _build
@@ -92,6 +93,7 @@ release-build:
   variables:
     EXTRA_MESON_FLAGS: "--buildtype=release"
   script:
+    - .gitlab-ci/show-info-linux.sh
     - meson subprojects update
     - meson ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS} ${BACKEND_FLAGS} ${FEATURE_FLAGS}
             _build
@@ -106,6 +108,7 @@ installed-tests:
     EXTRA_MESON_FLAGS: "--prefix=/usr --libdir=/usr/lib64 -Dinstall-tests=true"
     G_TEST_ACCESSIBLE: 1
   script:
+    - .gitlab-ci/show-info-linux.sh
     - meson subprojects update
     - meson ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS} ${BACKEND_FLAGS} ${FEATURE_FLAGS}
             _build
@@ -155,7 +158,7 @@ macos:
     - macos
   needs: []
   before_script:
-    - bash .gitlab-ci/show-execution-environment.sh
+    - bash .gitlab-ci/show-info-osx.sh
     - pip3 install --user meson==0.56
     - pip3 install --user ninja
     - export PATH=/Users/gitlabrunner/Library/Python/3.7/bin:$PATH

diff --git a/.gitlab-ci/show-execution-environment.sh b/.gitlab-ci/show-execution-environment.sh
deleted file mode 100755 (executable)
index cc1bfdb..0000000
--- a/.gitlab-ci/show-execution-environment.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-set -eux -o pipefail
-
-xcodebuild -version || :
-xcodebuild -showsdks || :
-
-system_profiler SPSoftwareDataType || :

diff --git a/.gitlab-ci/show-info-linux.sh b/.gitlab-ci/show-info-linux.sh
new file mode 100755 (executable)
index 0000000..b0d9ff3
--- /dev/null
+++ b/.gitlab-ci/show-info-linux.sh
@@ -0,0 +1,5 @@
+#! /bin/sh
+
+. /etc/os-release
+
+echo $PRETTY_NAME

diff --git a/.gitlab-ci/show-info-osx.sh b/.gitlab-ci/show-info-osx.sh
new file mode 100755 (executable)
index 0000000..cc1bfdb
--- /dev/null
+++ b/.gitlab-ci/show-info-osx.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+set -eux -o pipefail
+
+xcodebuild -version || :
+xcodebuild -showsdks || :
+
+system_profiler SPSoftwareDataType || :